Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 12 May 2010 22:40:47 +0000 (22:40 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 12 May 2010 22:40:47 +0000 (22:40 +0000)

Trivial merge